Throw directly instead of replacing error handler in ext/date #6954
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Girgias
force-pushed
the
date-throw-exception-directly
branch
from
63b440f to
7988eaf
Compare
nikic
reviewed
May 7, 2021
ext/date/php_date.c
Outdated
| if ((flags & PHP_DATE_INIT_CTOR) && err && err->error_count) { | ||
| /* spit out the first library error message, at least */ | ||
| php_error_docref(NULL, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", time_str, | ||
| zend_throw_error(zend_ce_exception, "Failed to parse time string (%s) at position %d (%c): %s", time_str, |
There was a problem hiding this comment.
Should be zend_throw_exception_ex, same for the others.
ext/date/php_date.c
Outdated
| @@ -4109,19 +4102,17 @@ PHP_FUNCTION(date_interval_format) | |||
| } | |||
| /* }}} */ | |||
|
|
|||
| static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, zend_long *recurrences, /*const*/ char *format, size_t format_length) /* {{{ */ | |||
| static void date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, zend_long *recurrences, /*const*/ char *format, size_t format_length) /* {{{ */ | |||
There was a problem hiding this comment.
I think it would have been nicer to retain the return value and check that instead of EG(exception).
Girgias
force-pushed
the
date-throw-exception-directly
branch
from
7988eaf to
dc6703c
Compare
Girgias
commented
May 7, 2021
| if ((flags & PHP_DATE_INIT_CTOR) && err && err->error_count) { | ||
| /* spit out the first library error message, at least */ | ||
| php_error_docref(NULL, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", time_str, | ||
| zend_throw_exception_ex(NULL, 0, "Failed to parse time string (%s) at position %d (%c): %s", time_str, |
There was a problem hiding this comment.
Should I keep E_WARNING as the Exception code?
nikic
approved these changes
May 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Those branches and/or functions are only called from the OOP/constructor API as such there is no need to use
zend_replace_error_handling().One usage of this remains in the
timezone_initialize()which could have a parameter added to signal if it should throw directly.